From 13dd69eeebf6ab87315117003a175e57b7cf49f0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucab@debian.org>
Date: Sun, 14 Aug 2016 21:52:58 +0000
Subject: [PATCH] debian: move to a stage1 build

---
 debian/control |  6 +++---
 debian/rules   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index c0373993c..6ffadf373 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,9 @@ Build-Depends: debhelper (>= 9.20141010),
                pkg-config,
                cmake,
                git,
-               cargo (>= 0.7.0) <stage2>,
-               python-dulwich <!stage2>,
-               python-pytoml <!stage2>,
+               cargo (>= 0.7.0) <!stage0>,
+               python-dulwich,
+               python-pytoml,
                ca-certificates,
                bash-completion,
                libhttp-parser-dev,
diff --git a/debian/rules b/debian/rules
index 171defa87..f10476957 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,11 +29,7 @@ override_dh_auto_configure:
 	./debian/cargo-vendor-pack.py
 
 override_dh_auto_build:
-ifneq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
-	ln -s `which cargo` $(CURDIR)/cargo-stage0
-	# Workaround for https://github.com/rust-lang/cargo/issues/1423
-	mv $(DEPSDIR) $(CURDIR)/.deps
-else
+ifneq ($(filter stage0,$(DEB_BUILD_PROFILES)),)
 	# Bootstrap cargo stage0
 	./debian/bootstrap.py \
 		--no-clean \
@@ -48,6 +44,10 @@ else
 	# Workaround for https://github.com/rust-lang/cargo/issues/1423
 	mv $(DEPSDIR) $(CURDIR)/.deps
 	ln -s `find $(CURDIR)/.deps -name 'cargo-*' -type f -executable` $(CURDIR)/cargo-stage0
+else
+	ln -s `which cargo` $(CURDIR)/cargo-stage0
+	# Workaround for https://github.com/rust-lang/cargo/issues/1423
+	mv $(DEPSDIR) $(CURDIR)/.deps
 endif
 	# Configure to build cargo using the just-built stage0
 	./configure \
-- 
2.30.2